Attachment #643294 for bug #717680

View | Details | Raw Unified | Return to bug 717680
Collapse All | Expand All




}

# build qmake
if [ '!' -e "$outpath/bin/qmake" ]; then
    echo "Creating qmake..."
    mkdir -p "$outpath/qmake" || exit


        setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS

        if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
            :
            :
        else
            :
            :
        fi

	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`


    if [ "$OPT_VERBOSE" = yes ]; then
        # Show the output of make
        (cd "$outpath/qmake"; "$MAKE" 			-j4  'CC=x86_64-pc-linux-gnu-gcc' 'CXX=x86_64-pc-linux-gnu-g++' 			'QMAKE_CFLAGS=-O2 -march=native -pipe -ggdb' 'QMAKE_CXXFLAGS=-O2 -march=native -pipe -ggdb' 'QMAKE_LFLAGS=-Wl,-O1 -Wl,--as-needed') || exit 2
    else
        # Hide the output of make
        # Use bash to print dots, if we have it, and stdout is a tty.

            (cd "$outpath/qmake"; "$MAKE" -s) || exit 2
        fi
        echo "Done."
fi
    fi

#-------------------------------------------------------------------------------

if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
    "$CFG_HOST_QT_TOOLS_PATH/qmake" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@"
else
    "$outpath/bin/qmake" "$relpathMangled" -- "$@" QMAKE_AR="x86_64-pc-linux-gnu-ar" QMAKE_CC="x86_64-pc-linux-gnu-gcc" QMAKE_LINK_C="x86_64-pc-linux-gnu-gcc" QMAKE_LINK_C_SHLIB="x86_64-pc-linux-gnu-gcc" QMAKE_CXX="x86_64-pc-linux-gnu-g++" QMAKE_LINK="x86_64-pc-linux-gnu-g++" QMAKE_LINK_SHLIB="x86_64-pc-linux-gnu-g++" QMAKE_OBJCOPY="x86_64-pc-linux-gnu-objcopy" QMAKE_RANLIB= QMAKE_STRIP="x86_64-pc-linux-gnu-strip" QMAKE_CFLAGS="-O2 -march=native -pipe -ggdb" QMAKE_CFLAGS_RELEASE= QMAKE_CFLAGS_DEBUG= QMAKE_CXXFLAGS="-O2 -march=native -pipe -ggdb" QMAKE_CXXFLAGS_RELEASE= QMAKE_CXXFLAGS_DEBUG= QMAKE_LFLAGS="-Wl,-O1 -Wl,--as-needed" QMAKE_LFLAGS_RELEASE= QMAKE_LFLAGS_DEBUG= 
fi

Lines 134-140 DEPEND_SRC = \ Link Here

(-)a/qmake/Makefile.unix (-1 / +1 lines)
134	# by configure); QTSRCS2 may include *.mm entries on macOS.	134	# by configure); QTSRCS2 may include *.mm entries on macOS.
135	# See below for special handling of qlibraryinfo.cpp	135	# See below for special handling of qlibraryinfo.cpp
136		136
137	CPPFLAGS = -g $(EXTRA_CPPFLAGS) \	137	CPPFLAGS = $(EXTRA_CPPFLAGS) \
138	-I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \	138	-I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
139	-I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \	139	-I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \
140	-I$(QMKGENSRC)/unix -I$(QMKGENSRC)/win32 -I$(QMKGENSRC)/mac \	140	-I$(QMKGENSRC)/unix -I$(QMKGENSRC)/win32 -I$(QMKGENSRC)/mac \

Return to bug 717680

Lines 712-717 setBootstrapVariable() Link Here

(-)a/configure (-6 / +8 lines)
712	}	712	}
713		713
714	# build qmake	714	# build qmake
		715	if [ '!' -e "$outpath/bin/qmake" ]; then
715	echo "Creating qmake..."	716	echo "Creating qmake..."
716	mkdir -p "$outpath/qmake" \|\| exit	717	mkdir -p "$outpath/qmake" \|\| exit
717		718
Lines 738-748 setBootstrapVariable() Link Here
738	setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS	739	setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
739		740
740	if [ "$CFG_DEBUG" = "no" ] \|\| [ "$CFG_RELEASE_TOOLS" = "yes" ]; then	741	if [ "$CFG_DEBUG" = "no" ] \|\| [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
741	setBootstrapVariable QMAKE_CXXFLAGS_RELEASE	742	:
742	EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"	743	:
743	else	744	else
744	setBootstrapVariable QMAKE_CXXFLAGS_DEBUG	745	:
745	EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"	746	:
746	fi	747	fi
747		748
748	adjrelpath=`echo "$relpath" \| sed 's/ /\\\\\\\\ /g'`	749	adjrelpath=`echo "$relpath" \| sed 's/ /\\\\\\\\ /g'`
Lines 795-801 setBootstrapVariable() Link Here
795		796
796	if [ "$OPT_VERBOSE" = yes ]; then	797	if [ "$OPT_VERBOSE" = yes ]; then
797	# Show the output of make	798	# Show the output of make
798	(cd "$outpath/qmake"; "$MAKE") \|\| exit 2	799	(cd "$outpath/qmake"; "$MAKE" -j4 'CC=x86_64-pc-linux-gnu-gcc' 'CXX=x86_64-pc-linux-gnu-g++' 'QMAKE_CFLAGS=-O2 -march=native -pipe -ggdb' 'QMAKE_CXXFLAGS=-O2 -march=native -pipe -ggdb' 'QMAKE_LFLAGS=-Wl,-O1 -Wl,--as-needed') \|\| exit 2
799	else	800	else
800	# Hide the output of make	801	# Hide the output of make
801	# Use bash to print dots, if we have it, and stdout is a tty.	802	# Use bash to print dots, if we have it, and stdout is a tty.
Lines 808-813 setBootstrapVariable() Link Here
808	(cd "$outpath/qmake"; "$MAKE" -s) \|\| exit 2	809	(cd "$outpath/qmake"; "$MAKE" -s) \|\| exit 2
809	fi	810	fi
810	echo "Done."	811	echo "Done."
		812	fi
811	fi	813	fi
812		814
813	#-------------------------------------------------------------------------------	815	#-------------------------------------------------------------------------------
Lines 853-857 fi Link Here
853	if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then	855	if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
854	"$CFG_HOST_QT_TOOLS_PATH/qmake" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@"	856	"$CFG_HOST_QT_TOOLS_PATH/qmake" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@"
855	else	857	else
856	"$outpath/bin/qmake" "$relpathMangled" -- "$@"	858	"$outpath/bin/qmake" "$relpathMangled" -- "$@" QMAKE_AR="x86_64-pc-linux-gnu-ar" QMAKE_CC="x86_64-pc-linux-gnu-gcc" QMAKE_LINK_C="x86_64-pc-linux-gnu-gcc" QMAKE_LINK_C_SHLIB="x86_64-pc-linux-gnu-gcc" QMAKE_CXX="x86_64-pc-linux-gnu-g++" QMAKE_LINK="x86_64-pc-linux-gnu-g++" QMAKE_LINK_SHLIB="x86_64-pc-linux-gnu-g++" QMAKE_OBJCOPY="x86_64-pc-linux-gnu-objcopy" QMAKE_RANLIB= QMAKE_STRIP="x86_64-pc-linux-gnu-strip" QMAKE_CFLAGS="-O2 -march=native -pipe -ggdb" QMAKE_CFLAGS_RELEASE= QMAKE_CFLAGS_DEBUG= QMAKE_CXXFLAGS="-O2 -march=native -pipe -ggdb" QMAKE_CXXFLAGS_RELEASE= QMAKE_CXXFLAGS_DEBUG= QMAKE_LFLAGS="-Wl,-O1 -Wl,--as-needed" QMAKE_LFLAGS_RELEASE= QMAKE_LFLAGS_DEBUG=
857	fi	859	fi