makefile.mk (d76c79b2) makefile.mk (10edccc7)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 57 unchanged lines hidden (view full) ---

66
67.ELSE
68
69CONFIGURE_DIR=
70CONFIGURE_ACTION=.$/configure
71
72.IF "$(OS)"=="MACOSX"
73CONFIGURE_FLAGS='CXX=$(CXX)'
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 57 unchanged lines hidden (view full) ---

66
67.ELSE
68
69CONFIGURE_DIR=
70CONFIGURE_ACTION=.$/configure
71
72.IF "$(OS)"=="MACOSX"
73CONFIGURE_FLAGS='CXX=$(CXX)'
74CONFIGURE_FLAGS+='CXXFLAGS=-stdlib=libc++ -U__STRICT_ANSI__'
74CONFIGURE_FLAGS+='CXXFLAGS=-stdlib=libc++ -U__STRICT_ANSI__ -isysroot $(MACOSX_SDK_PATH)'
75.ENDIF
76
77BUILD_DIR=$(CONFIGURE_DIR)
78BUILD_ACTION=$(GNUMAKE)
79BUILD_FLAGS+= -j$(EXTMAXPROCESS)
80
81
82OUTDIR2INC=include/gtest

--- 18 unchanged lines hidden --- 		75.ENDIF
76
77BUILD_DIR=$(CONFIGURE_DIR)
78BUILD_ACTION=$(GNUMAKE)
79BUILD_FLAGS+= -j$(EXTMAXPROCESS)
80
81
82OUTDIR2INC=include/gtest

--- 18 unchanged lines hidden ---